Bug 643270: VS2010 Project Files (autotools)

-Update to distribute the VS2010 files.
-Added rules in Makefile.am's of GDK and GTK to fill in the
 project/filter files templates with up-to-date source file
 listings to simplify maintenace.

Any comments on the usage of the VS2010 files are welcome!

diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 14e08c059e9596123af5b2993a55c3c9fedfcbb8..050539c35d54107a74de7023a304f15c14f2b4f7 100644 (file)
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = \
-       vs9
+       vs9  \
+       vs10

diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
new file mode 100644 (file)
index 0000000..6aa2f86
--- /dev/null
+++ b/build/win32/vs10/Makefile.am
@@ -0,0 +1,19 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST += \
+       README.txt \
+       gtk+.sln \
+       gtk+.props \
+       gdk-win32.vcxproj \
+       gdk-win32.vcxproj.filters \
+       gdk.vcxproj \
+       gdk.vcxprojin \
+       gdk.vcxproj.filters \
+       gdk.vcxproj.filtersin \
+       gtk.vcxproj \
+       gtk.vcxprojin \
+       gtk.vcxproj.filters \
+       gtk.vcxproj.filtersin \
+       gtk-demo.vcxproj \
+       gtk-demo.vcxproj.filters \
+       install.vcxproj

diff --git a/configure.ac b/configure.ac
index 3f73ffda7b2e6f5e53f2a108119cf51f5c3a99ab..e493012bae649792ea6816f692a8976a99b6d32b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1662,6 +1662,7 @@ docs/tools/Makefile
 build/Makefile
 build/win32/Makefile
 build/win32/vs9/Makefile
+build/win32/vs10/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index cb1fd545aa764b6fadce288d1cd0e1bd1a540df8..9f4a570b0d991f1d3d0b13c87c82a964af7c95ae 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -349,7 +349,7 @@ stamp-gc-h: $(top_builddir)/config.status
        $(AM_V_at) cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h
        echo timestamp > stamp-gc-h
 
-dist-hook: ../build/win32/vs9/gdk.vcproj
+dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../build/win32/vs10/gdk.vcxproj.filters
 
 ../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin
        for F in $(libgdk_3_la_SOURCES); do \
@@ -360,6 +360,26 @@ dist-hook: ../build/win32/vs9/gdk.vcproj
        done >libgdk.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk.vcprojin >$@
        rm libgdk.sourcefiles
+       
+../build/win32/vs10/gdk.vcxproj: ../build/win32/vs10/gdk.vcxprojin
+       for F in $(libgdk_3_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gdk\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgdk.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxprojin >$@
+       rm libgdk.vs10.sourcefiles
+
+../build/win32/vs10/gdk.vcxproj.filters: ../build/win32/vs10/gdk.vcxproj.filtersin
+       for F in $(libgdk_3_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gdk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done >libgdk.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxproj.filtersin >$@
+       rm libgdk.vs10.sourcefiles.filters
 
 DISTCLEANFILES = gdkconfig.h stamp-gc-h
 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index efe93154b7ebb0e1528b52b0c7a852c7e2117c1e..0279dec662d468b1e98f2521fefa1a90c2e04401 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -918,7 +918,7 @@ install-mac-key-theme:
 uninstall-mac-key-theme:
 endif
 
-dist-hook: ../build/win32/vs9/gtk.vcproj
+dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../build/win32/vs10/gtk.vcxproj.filters
 
 ../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin
        for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
@@ -929,6 +929,26 @@ dist-hook: ../build/win32/vs9/gtk.vcproj
        done >libgtk.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@
        rm libgtk.sourcefiles
+       
+../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin
+       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgtk.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxprojin >$@
+       rm libgtk.vs10.sourcefiles
+       
+../build/win32/vs10/gtk.vcxproj.filters: ../build/win32/vs10/gtk.vcxproj.filtersin
+       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done >libgtk.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxproj.filtersin >$@
+       rm libgtk.vs10.sourcefiles.filters
 
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-def-file install-mac-key-theme